Auto merge of #2287 - alexcrichton:openbsd, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 17 Jan 2016 00:56:58 +0000 (00:56 +0000)
committerbors <bors@rust-lang.org>
Sun, 17 Jan 2016 00:56:58 +0000 (00:56 +0000)
cc @semarie


Trivial merge